3140f25515904faaeef83470011f84f119078848,src/main/java/de/webfilesys/gui/ajax/XmlMultiImageCutCopyHandler.java,XmlMultiImageCutCopyHandler,process,#,31
Before Change
boolean clipBoardWasEmpty = ((clipBoard == null) || clipBoard.isEmpty());
boolean wasCopyOperation = false;
boolean wasMoveOperation = false;
if (clipBoard != null)
{
wasCopyOperation = clipBoard.isCopyOperation();
wasMoveOperation = clipBoard.isMoveOperation();
if ((!cmd.equals("copyAdd")) && (!cmd.equals("moveAdd"))) {
clipBoard.reset();
}
}
else
{
clipBoard = new ClipBoard();
session.setAttribute("clipBoard", clipBoard);
}
actPath = getCwd();
String pathWithSlash = actPath;
if (!actPath.endsWith(File.separator) && (!actPath.endsWith("/")))
{
pathWithSlash = actPath + File.separator;
}
for (int i = 0; i < selectedFiles.size(); i++)
{
String sourceFilename = pathWithSlash + selectedFiles.elementAt(i);
clipBoard.addFile(sourceFilename);
}
if (cmd.equals("copy"))
{
clipBoard.setCopyOperation();
}
else if (cmd.equals("move"))
{
clipBoard.setMoveOperation();
}
String resultMsg = null;
if (cmd.equals("copy"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filescopied","files copied to clipboard");
}
else if (cmd.equals("move"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filesmoved","files moved to clipboard");
}
else if (cmd.equals("copyAdd"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filesAddedForCopy","files added for copy operation.")
+ " " + clipBoard.keySet().size() + " " + getResource("alert.filesInClipboard","files are selected now.");
}
else if (cmd.equals("moveAdd"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filesAddedForMove","files added for move operation.")
+ " " + clipBoard.keySet().size() + " " + getResource("alert.filesInClipboard","files are selected now.");
}
Element resultElement = doc.createElement("result");
XmlUtil.setChildText(resultElement, "message", resultMsg);
if ((clipBoardWasEmpty) ||
(wasCopyOperation && cmd.equals("move")) ||
(wasMoveOperation && cmd.equals("copy")))
{
XmlUtil.setChildText(resultElement, "clipboardWasEmpty", "true");
}
else
{
XmlUtil.setChildText(resultElement, "clipboardWasEmpty", "false");
}
XmlUtil.setChildText(resultElement, "success", "true");
After Change
ClipBoard clipBoard = (ClipBoard) session.getAttribute("clipBoard");
boolean clipBoardWasEmpty = ((clipBoard == null) || clipBoard.isEmpty());
boolean wasMoveOperation = false;
if (clipBoard != null)
{
wasMoveOperation = clipBoard.isMoveOperation();
if ((!cmd.equals("copyAdd")) && (!cmd.equals("moveAdd"))) {
clipBoard.reset();
}
}
else
{
clipBoard = new ClipBoard();
session.setAttribute("clipBoard", clipBoard);
}
actPath = getCwd();
String pathWithSlash = actPath;
if (!actPath.endsWith(File.separator) && (!actPath.endsWith("/")))
{
pathWithSlash = actPath + File.separator;
}
for (int i = 0; i < selectedFiles.size(); i++)
{
String sourceFilename = pathWithSlash + selectedFiles.elementAt(i);
clipBoard.addFile(sourceFilename);
}
if (cmd.equals("copy"))
{
clipBoard.setCopyOperation();
}
else if (cmd.equals("move"))
{
clipBoard.setMoveOperation();
}
String resultMsg = null;
if (cmd.equals("copy"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filescopied","files copied to clipboard");
}
else if (cmd.equals("move"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filesmoved","files moved to clipboard");
}
else if (cmd.equals("copyAdd"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filesAddedForCopy","files added for copy operation.")
+ " " + clipBoard.keySet().size() + " " + getResource("alert.filesInClipboard","files are selected now.");
}
else if (cmd.equals("moveAdd"))
{
resultMsg = selectedFiles.size() + " " + getResource("alert.filesAddedForMove","files added for move operation.")
+ " " + clipBoard.keySet().size() + " " + getResource("alert.filesInClipboard","files are selected now.");
}
Element resultElement = doc.createElement("result");
XmlUtil.setChildText(resultElement, "message", resultMsg);
if (clipBoard.isCopyOperation()) {
XmlUtil.setChildText(resultElement, "copyOperation", "true");
}
if (clipBoard.isMoveOperation()) {
XmlUtil.setChildText(resultElement, "moveOperation", "true");
}
if (clipBoardWasEmpty) {
XmlUtil.setChildText(resultElement, "enablePaste", "true");
}
if ((clipBoardWasEmpty || wasMoveOperation) && clipBoard.isCopyOperation()) {
XmlUtil.setChildText(resultElement, "enablePasteAsLink", "true");
}